Add support for Garmin D110's. Tested by Drew Commins.

diff --git a/gpsbabel/garmin.c b/gpsbabel/garmin.c
index f321d1f3f4edbb56afcd7e50ff1eef4334a65bd3..dfaf25572e0826dd03f8efaa637be4dbca434aad 100644 (file)
--- a/gpsbabel/garmin.c
+++ b/gpsbabel/garmin.c
@@ -214,6 +214,8 @@ waypt_read(void)
                } else {
                        wpt_tmp->altitude = way[i]->alt;
                }
+               if (way[i]->Time_populated)
+                       wpt_tmp->creation_time = way[i]->Time;
                
                waypt_add(wpt_tmp);
                GPS_Way_Del(&way[i]);
@@ -476,6 +478,7 @@ wpt->gc_data.container == gc_micro ?  "M " : "",
                } else {
                        way[i]->alt = wpt->altitude;
                }
+               way[i]->Time = wpt->creation_time;
                i++;
        }
 

diff --git a/gpsbabel/jeeps/gps.h b/gpsbabel/jeeps/gps.h
index 2c6f0c1965f01be7be7a264064339a08d6e1ba12..686a813981b46ddc7944e4fb008e80d9e106101e 100644 (file)
--- a/gpsbabel/jeeps/gps.h
+++ b/gpsbabel/jeeps/gps.h
@@ -149,6 +149,9 @@ typedef struct GPS_SWay
     int32  rte_link_class;
     char   rte_link_subclass[18];
     char   rte_link_ident[256];
+
+    char     Time_populated;   /* 1 if true */
+    time_t   Time;             /* Unix time */
 } GPS_OWay, *GPS_PWay;
 
 

diff --git a/gpsbabel/jeeps/gpsapp.c b/gpsbabel/jeeps/gpsapp.c
index 084ba96d56c3c92ba5ad390d7acb1c5077baa787..e58ca1a8ab7f22bd9ded4e6a146a6b54f3395660 100644 (file)
--- a/gpsbabel/jeeps/gpsapp.c
+++ b/gpsbabel/jeeps/gpsapp.c
@@ -48,7 +48,7 @@ static void   GPS_D105_Get(GPS_PWay *way, UC *s);
 static void   GPS_D106_Get(GPS_PWay *way, UC *s);
 static void   GPS_D107_Get(GPS_PWay *way, UC *s);
 static void   GPS_D108_Get(GPS_PWay *way, UC *s);
-static void   GPS_D109_Get(GPS_PWay *way, UC *s);
+static void   GPS_D109_Get(GPS_PWay *way, UC *s, int proto);
 static void   GPS_D150_Get(GPS_PWay *way, UC *s);
 static void   GPS_D151_Get(GPS_PWay *way, UC *s);
 static void   GPS_D152_Get(GPS_PWay *way, UC *s);
@@ -64,7 +64,7 @@ static void   GPS_D105_Send(UC *data, GPS_PWay way, int32 *len);
 static void   GPS_D106_Send(UC *data, GPS_PWay way, int32 *len);
 static void   GPS_D107_Send(UC *data, GPS_PWay way, int32 *len);
 static void   GPS_D108_Send(UC *data, GPS_PWay way, int32 *len);
-static void   GPS_D109_Send(UC *data, GPS_PWay way, int32 *len);
+static void   GPS_D109_Send(UC *data, GPS_PWay way, int32 *len, int proto);
 static void   GPS_D150_Send(UC *data, GPS_PWay way, int32 *len);
 static void   GPS_D151_Send(UC *data, GPS_PWay way, int32 *len);
 static void   GPS_D152_Send(UC *data, GPS_PWay way, int32 *len);
@@ -343,10 +343,9 @@ static void GPS_A001(GPS_PPacket packet)
            }
            else if(data<200)
            {
-               if(data!=100)
-                   GPS_Protocol_Error(tag,data);
-               else
+               if(data==100)
                    gps_waypt_transfer = pA100;
+               /* Ignore A101 Waypoint Category Transfer Protocol. */
                continue;
            }
            else if(data<300)
@@ -439,7 +438,7 @@ static void GPS_A001(GPS_PPacket packet)
        {
            if(lasta<200)
            {
-               if(data<=109 && data>=100)
+               if(data<=110 && data>=100)
                {
                    gps_waypt_type = data;
                    continue;
@@ -454,6 +453,11 @@ static void GPS_A001(GPS_PPacket packet)
                    gps_waypt_type = data;
                    continue;
                }
+               if (data == 120) 
+               {
+                       /* Quest 3.0 has a D120  for Wpt category ignore it*/
+                       continue;
+               }
                else
                    GPS_Protocol_Error(tag,data);
            }
@@ -472,7 +476,7 @@ static void GPS_A001(GPS_PPacket packet)
                    continue;
                }
                    
-               if(data<=109 && data>=100)
+               if(data<=110 && data>=100)
                {
                    gps_rte_type = data;
                    continue;
@@ -696,7 +700,10 @@ int32 GPS_A100_Get(const char *port, GPS_PWay **way, int (*cb)())
            GPS_D108_Get(&((*way)[i]),rec->data);
            break;
        case pD109:
-           GPS_D109_Get(&((*way)[i]),rec->data);
+           GPS_D109_Get(&((*way)[i]),rec->data, 109);
+           break;
+       case pD110:
+           GPS_D109_Get(&((*way)[i]),rec->data, 110);
            break;
        case pD150:
            GPS_D150_Get(&((*way)[i]),rec->data);
@@ -827,7 +834,10 @@ int32 GPS_A100_Send(const char *port, GPS_PWay *way, int32 n, int (*cb)())
            GPS_D108_Send(data,way[i],&len);
            break;
        case pD109:
-           GPS_D109_Send(data,way[i],&len);
+           GPS_D109_Send(data,way[i],&len, 109);
+           break;
+       case pD110:
+           GPS_D109_Send(data,way[i],&len, 110);
            break;
        case pD150:
            GPS_D150_Send(data,way[i],&len);
@@ -1269,8 +1279,11 @@ static void GPS_D108_Get(GPS_PWay *way, UC *s)
 ** @param [r] s [UC *] packet data
 **
 ** @return [void]
+** Quest uses D110's which are just like D109's but with the addition
+** of temp, time, and wpt_cat stuck between ete and ident.   Rather than
+** duplicating the function, we just handle this at runtime.
 ************************************************************************/
-static void GPS_D109_Get(GPS_PWay *way, UC *s)
+static void GPS_D109_Get(GPS_PWay *way, UC *s, int protoid)
 {
     UC *p;
     UC *q;
@@ -1305,6 +1318,11 @@ static void GPS_D109_Get(GPS_PWay *way, UC *s)
     for(i=0;i<2;++i) (*way)->cc[i] = *p++;
 
     p += 4; /* Skip over "outbound link ete in seconds */
+    if (protoid == 110) {
+       p += 4; /* skip float temp */
+       p += 4;  /* skip longword time */
+       p += 2; /* skip int "category membership " */
+    }
 
     q = (UC *) (*way)->ident;
     while((*q++ = *p++));
@@ -1951,8 +1969,9 @@ static void GPS_D108_Send(UC *data, GPS_PWay way, int32 *len)
 ** @param [w] len [int32 *] packet length
 **
 ** @return [void]
+** D109's and D110's are so simlar, we handle themw with the same code.
 ************************************************************************/
-static void GPS_D109_Send(UC *data, GPS_PWay way, int32 *len)
+static void GPS_D109_Send(UC *data, GPS_PWay way, int32 *len, int protoid)
 {
     UC *p;
     UC *q;
@@ -1964,7 +1983,13 @@ static void GPS_D109_Send(UC *data, GPS_PWay way, int32 *len)
     *p++ = 0 /* way->colour*/ ;                /* If non-zero, the waypoint is in 
                                           invisible ink on the V. */
     *p++ = way->dspl;
-    *p++ = 0x70;
+    if (protoid == 109) {
+       *p++ = 0x70;
+    } else if (protoid == 110) {
+       *p++  = 0x80;
+    } else {
+       GPS_Warning("Unknown protoid in GPS_D109_Send.");
+    }
     GPS_Util_Put_Short(p,way->smbl);
     p+=sizeof(int16);
     for(i=0;i<18;++i) *p++ = way->subclass[i];
@@ -1982,6 +2007,21 @@ static void GPS_D109_Send(UC *data, GPS_PWay way, int32 *len)
     for(i=0;i<2;++i) *p++ = way->state[i];
     for(i=0;i<2;++i) *p++ = way->cc[i];
     for(i=0;i<4;++i) *p++ = 0xff; /* D109 silliness for ETE */
+    if (protoid == 110) {
+       float temp = 1.0e25;
+
+       GPS_Util_Put_Float(p, temp);
+       p += 4;
+
+       if (way->Time_populated) {
+               GPS_Util_Put_Uint(p,GPS_Math_Utime_To_Gtime(way->Time));
+               p+=sizeof(uint32);
+       } else {
+               for(i=0;i<4;++i) *p++ = 0xff; /* unknown time*/
+       }
+
+       for(i=0;i<2;++i) *p++ = 0x00; /* D110 category */
+    }
 
     q = (UC *) way->ident;
     i = XMIN(51, sizeof(way->ident));
@@ -2369,7 +2409,10 @@ int32 GPS_A200_Get(const char *port, GPS_PWay **way)
            GPS_D108_Get(&((*way)[i]),rec->data);
            break;
        case pD109:
-           GPS_D109_Get(&((*way)[i]),rec->data);
+           GPS_D109_Get(&((*way)[i]),rec->data,109);
+           break;
+       case pD110:
+           GPS_D109_Get(&((*way)[i]),rec->data,110);
            break;
        case pD150:
            GPS_D150_Get(&((*way)[i]),rec->data);
@@ -2559,7 +2602,10 @@ int32 GPS_A201_Get(const char *port, GPS_PWay **way)
            GPS_D108_Get(&((*way)[i]),rec->data);
            break;
        case pD109:
-           GPS_D109_Get(&((*way)[i]),rec->data);
+           GPS_D109_Get(&((*way)[i]),rec->data,109);
+           break;
+       case pD110:
+           GPS_D109_Get(&((*way)[i]),rec->data,110);
            break;
        case pD150:
            GPS_D150_Get(&((*way)[i]),rec->data);
@@ -2870,7 +2916,10 @@ int32 GPS_A201_Send(const char *port, GPS_PWay *way, int32 n)
                GPS_D108_Send(data,way[i],&len);
                break;
            case pD109:
-               GPS_D109_Send(data,way[i],&len);
+               GPS_D109_Send(data,way[i],&len, 109);
+               break;
+           case pD110:
+               GPS_D109_Send(data,way[i],&len, 110);
                break;
            case pD150:
                GPS_D150_Send(data,way[i],&len);
@@ -4051,7 +4100,10 @@ int32 GPS_A400_Get(const char *port, GPS_PWay **way)
            GPS_D108_Get(&((*way)[i]),rec->data);
            break;
        case pD109:
-           GPS_D109_Get(&((*way)[i]),rec->data);
+           GPS_D109_Get(&((*way)[i]),rec->data,109);
+           break;
+       case pD110:
+           GPS_D109_Get(&((*way)[i]),rec->data,110);
            break;
        case pD450:
            GPS_D450_Get(&((*way)[i]),rec->data);

diff --git a/gpsbabel/jeeps/gpsinput.c b/gpsbabel/jeeps/gpsinput.c
index ad3e99b6e63a040df3308b2f98eb3e5b5234c067..89d0797c84e13fe2b79cd17655b389d7528bd0c7 100644 (file)
--- a/gpsbabel/jeeps/gpsinput.c
+++ b/gpsbabel/jeeps/gpsinput.c
@@ -422,7 +422,11 @@ int32 GPS_Input_Get_Waypoint(GPS_PWay **way, FILE *inf)
            if(ret<0) return gps_errno;
            break;
        case 109:
-           ret = GPS_Input_Get_D109(&((*way)[i]),inf);
+           ret = GPS_Input_Get_D109(&((*way)[i]),inf, 109);
+           if(ret<0) return gps_errno;
+           break;
+       case 110:
+           ret = GPS_Input_Get_D109(&((*way)[i]),inf, 110);
            if(ret<0) return gps_errno;
            break;
        case 150:
@@ -550,7 +554,11 @@ int32 GPS_Input_Get_Proximity(GPS_PWay **way, FILE *inf)
            if(ret<0) return gps_errno;
            break;
        case 109:
-           ret = GPS_Input_Get_D109(&((*way)[i]),inf);
+           ret = GPS_Input_Get_D109(&((*way)[i]),inf, 109);
+           if(ret<0) return gps_errno;
+           break;
+       case 110:
+           ret = GPS_Input_Get_D109(&((*way)[i]),inf, 110);
            if(ret<0) return gps_errno;
            break;
        case 450:
@@ -1070,8 +1078,9 @@ static int32 GPS_Input_Get_D108(GPS_PWay *way, FILE *inf)
 ** @param [r] inf [FILE *] stream
 **
 ** @return [int32] number of entries
+** D109's and D110's are so similar, we handle both with the same function.
 ************************************************************************/
-static int32 GPS_Input_Get_D109(GPS_PWay *way, FILE *inf)
+static int32 GPS_Input_Get_D109(GPS_PWay *way, FILE *inf, int protonum)
 {
     char s[GPS_ARB_LEN];
     char *p;

diff --git a/gpsbabel/jeeps/gpsprot.h b/gpsbabel/jeeps/gpsprot.h
index 8c807bf16855ac738d2cb87238940c155a4e879d..4fe5caa1488c06a29cc6d64d8fb4731d9aa28ed5 100644 (file)
--- a/gpsbabel/jeeps/gpsprot.h
+++ b/gpsbabel/jeeps/gpsprot.h
@@ -141,6 +141,7 @@ int32 gps_pvt_transfer;
 #define pD107 107
 #define pD108 108
 #define pD109 109
+#define pD110 110
 #define pD150 150
 #define pD151 151
 #define pD152 152